Bug 591859 - Use glib/gi18n-lib to get correct gettext package

We need to use the -lib variant which in turn uses the
GETTEXT_PACKAGE define, because the default translation
domain is actually mutter, not gnome-shell.

diff --git a/js/ui/dash.js b/js/ui/dash.js
index a96efa0593ba390b81a48f79c275606172fc88d3..dd4e4bbf535728fef3bf406a34bf57e5ff3deb14 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -593,6 +593,8 @@ Dash.prototype = {
 
         /***** Places *****/
 
+        /* Translators: This is in the sense of locations for documents,
+           network locations, etc. */
         let placesSection = new Section(_("PLACES"), true);
         let placesDisplay = new Places.Places();
         placesSection.content.append(placesDisplay.actor, Big.BoxPackFlags.EXPAND);

diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
index bde7fcccab8f93f1f59a2aaf42a54c295938c379..167ca7d55a04fd3e728e32b0a186eee8830952c6 100644 (file)
--- a/src/gdmuser/gdm-user-manager.c
+++ b/src/gdmuser/gdm-user-manager.c
@@ -35,7 +35,8 @@
 #endif /* HAVE_PATHS_H */
 
 #include <glib.h>
-#include <glib/gi18n.h>
+/* Note on sync with gdm; need to use -lib here */
+#include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 #include <glib-object.h>
 #include <gio/gio.h>

diff --git a/src/gdmuser/gdm-user.c b/src/gdmuser/gdm-user.c
index 27bf8ec4e4037349497b077e2175d01de9cfad51..d5d0d346f768562f9e1b4b4c334468867f5f704c 100644 (file)
--- a/src/gdmuser/gdm-user.c
+++ b/src/gdmuser/gdm-user.c
@@ -26,7 +26,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <glib/gi18n.h>
+/* Note on sync with gdm; need to use -lib here */
+#include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 

diff --git a/src/shell-global.c b/src/shell-global.c
index 7dd5c44beb33618def79a7c0c72cd23a8a7cadf5..e192b34e535dc2b1bc2301d1f0840af5f53ba581 100644 (file)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <dbus/dbus-glib.h>
 #include <gio/gio.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <math.h>
 #include <X11/extensions/Xfixes.h>
 

diff --git a/src/shell-status-menu.c b/src/shell-status-menu.c
index 1ea6e1d7b50dc8b994b0da920a59598ef15629ec..a5b1ccd7817d64c9264ca512daa2dd7da4e87965 100644 (file)
--- a/src/shell-status-menu.c
+++ b/src/shell-status-menu.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>